auto merge of #862 : alexcrichton/cargo/issue-858, r=huonw
authorbors <bors@rust-lang.org>
Thu, 13 Nov 2014 22:14:45 +0000 (22:14 +0000)
committerbors <bors@rust-lang.org>
Thu, 13 Nov 2014 22:14:45 +0000 (22:14 +0000)
Closes #858


Trivial merge